Merge from mainline.
authorKatsumi Yamaoka <katsumi@flagship2>
Sun, 20 Jun 2010 11:23:04 +0000 (11:23 +0000)
committerKatsumi Yamaoka <katsumi@flagship2>
Sun, 20 Jun 2010 11:23:04 +0000 (11:23 +0000)

Trivial merge